+
+ <#if cartLine.getShoppingListId()??>
+ <#assign itemsFromList = true />
+ L
+ <#elseif cartLine.getIsPromo()>
+ <#assign promoItems = true />
+ P
<#else>
- <#assign parentProductId = cartLine.getProductId() />
+
- <#assign smallImageUrl = Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher, "url")! />
- <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg" />
- <#if smallImageUrl?string?has_content>
-
- 
-
-
- <#-- end code to display a small image of the product -->
- <#-- ${cartLineIndex} - -->
- ${cartLine.getProductId()} -
- ${cartLine.getName()!} : ${cartLine.getDescription()!}
- <#-- For configurable products, the selected options are shown -->
- <#if cartLine.getConfigWrapper()??>
- <#assign selectedOptions = cartLine.getConfigWrapper().getSelectedOptions()! />
- <#if selectedOptions??>
-
- <#list selectedOptions as option>
-
- ${option.getDescription()}
-
-
+ |
+
+ <#if cartLine.getProductId()??>
+ <#-- product item -->
+ <#-- start code to display a small image of the product -->
+ <#if cartLine.getParentProductId()??>
+ <#assign parentProductId = cartLine.getParentProductId() />
+ <#else>
+ <#assign parentProductId = cartLine.getProductId() />
-
+ <#assign smallImageUrl =
+ Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(
+ cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher, "url")! />
+ <#if !smallImageUrl?string?has_content>
+ <#assign smallImageUrl = "/images/defaultImage.jpg" />
+
+ <#if smallImageUrl?string?has_content>
+
+
+
+
+ <#-- end code to display a small image of the product -->
+ <#-- ${cartLineIndex} - -->
+ ${cartLine.getProductId()} -
+ ${cartLine.getName()!}
+ : ${cartLine.getDescription()!}
+ <#-- For configurable products, the selected options are shown -->
+ <#if cartLine.getConfigWrapper()??>
+ <#assign selectedOptions = cartLine.getConfigWrapper().getSelectedOptions()! />
+ <#if selectedOptions??>
+
+ <#list selectedOptions as option>
+
+ ${option.getDescription()}
+
+
+
+
- <#-- if inventory is not required check to see if it is out of stock and needs to have a message shown about that... -->
- <#assign itemProduct = cartLine.getProduct() />
- <#assign isStoreInventoryNotRequiredAndNotAvailable = Static["org.apache.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request, itemProduct, cartLine.getQuantity(), false, false) />
- <#if isStoreInventoryNotRequiredAndNotAvailable && itemProduct.inventoryMessage?has_content>
+ <#-- if inventory is not required check to see if it is out
+ of stock and needs to have a message shown about that... -->
+ <#assign itemProduct = cartLine.getProduct() />
+ <#assign isStoreInventoryNotRequiredAndNotAvailable =
+ Static["org.apache.ofbiz.product.store.ProductStoreWorker"]
+ .isStoreInventoryRequiredAndAvailable(request, itemProduct,
+ cartLine.getQuantity(), false, false) />
+ <#if isStoreInventoryNotRequiredAndNotAvailable && itemProduct.inventoryMessage?has_content>
(${itemProduct.inventoryMessage})
+
+
+ <#else>
+ <#-- this is a non-product item -->
+ ${cartLine.getItemTypeDescription()!}: ${cartLine.getName()!}
- <#else>
- <#-- this is a non-product item -->
- ${cartLine.getItemTypeDescription()!}: ${cartLine.getName()!}
-
- <#assign attrs = cartLine.getOrderItemAttributes()/>
- <#if attrs?has_content>
- <#assign attrEntries = attrs.entrySet()/>
-
- <#list attrEntries as attrEntry>
+ <#assign attrs = cartLine.getOrderItemAttributes()/>
+ <#if attrs?has_content>
+ <#assign attrEntries = attrs.entrySet()/>
+
+ <#list attrEntries as attrEntry>
+ -
+ ${attrEntry.getKey()} : ${attrEntry.getValue()}
+
+
+
+
+ <#if (cartLine.getIsPromo() && cartLine.getAlternativeOptionProductIds()?has_content)>
+ <#-- Show alternate gifts if there are any... -->
+ ${uiLabelMap.OrderChooseFollowingForGift}:
+
+ <#-- this is the old way, it lists out the options and is not as nice as the drop-down
+
+ <#list cartLine.getAlternativeOptionProductIds() as alternativeOptionProductId>
+ <#assign alternativeOptionName = Static["org.apache.ofbiz.product.product.ProductWorker"]
+ .getGwpAlternativeOptionName(delegator, alternativeOptionProductId,
+ requestAttributes.locale) />
-
- ${attrEntry.getKey()} : ${attrEntry.getValue()}
+ Select: ${alternativeOptionName?default(alternativeOptionProductId)}
-
-
-
- <#if (cartLine.getIsPromo() && cartLine.getAlternativeOptionProductIds()?has_content)>
- <#-- Show alternate gifts if there are any... -->
- ${uiLabelMap.OrderChooseFollowingForGift}:
-
- <#-- this is the old way, it lists out the options and is not as nice as the drop-down
-
- <#list cartLine.getAlternativeOptionProductIds() as alternativeOptionProductId>
- <#assign alternativeOptionName = Static["org.apache.ofbiz.product.product.ProductWorker"].getGwpAlternativeOptionName(delegator, alternativeOptionProductId, requestAttributes.locale) />
- - Select: ${alternativeOptionName?default(alternativeOptionProductId)}
-
-
- -->
-
- |
+
+
+ -->
+
+
- <#-- gift wrap option -->
- <#assign showNoGiftWrapOptions = false />
-
- <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP! />
- <#assign selectedOption = cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")! />
- <#if giftWrapOption?has_content>
-
- <#elseif showNoGiftWrapOptions>
-
- <#else>
-
-
- |
- <#-- end gift wrap option -->
+ <#-- gift wrap option -->
+ <#assign showNoGiftWrapOptions = false />
+
+ <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP! />
+ <#assign selectedOption = cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")! />
+ <#if giftWrapOption?has_content>
+
+ <#elseif showNoGiftWrapOptions>
+
+ <#else>
+
+
+ |
+ <#-- end gift wrap option -->
-
- <#if cartLine.getIsPromo() || cartLine.getShoppingListId()??>
- <#if fixedAssetExist == true>
+ |
+ <#if cartLine.getIsPromo() || cartLine.getShoppingListId()??>
+ <#if fixedAssetExist == true>
<#if cartLine.getReservStart()??>
-
-
- | |
- ${cartLine.getReservStart()?string("yyyy-mm-dd")} |
- ${cartLine.getReservLength()?string.number} |
-
- | |
- ${cartLine.getReservPersons()?string.number} |
-
+
+
+ | |
+ ${cartLine.getReservStart()?string("yyyy-mm-dd")} |
+ ${cartLine.getReservLength()?string.number} |
+
+ | |
+ ${cartLine.getReservPersons()?string.number} |
+
<#else>
-
-
- | -- |
- -- |
-
-
- | -- |
-
+
+
+ | -- |
+ -- |
+
+
+ | -- |
+
${cartLine.getQuantity()?string.number} |
- <#else><#-- fixedAssetExist -->
+ <#else><#-- fixedAssetExist -->
${cartLine.getQuantity()?string.number}
+
+ <#else><#-- Is Promo or Shoppinglist -->
+ <#if fixedAssetExist == true>
+ <#if cartLine.getReservStart()??>
+
+
+
+ <#else>
+ ${uiLabelMap.EcommerceYourShoppingCartEmpty}.
+
<#-- Copy link bar to bottom to include a link bar at the bottom too -->
+
+ ${uiLabelMap.ProductPromoCodes}
+
+
- ${uiLabelMap.ProductPromoCodes}
+
-
+
+
- ${uiLabelMap.OrderSpecialOffers}
+ ${uiLabelMap.OrderSpecialOffers}
- <#-- show promotions text -->
-
+ <#-- show promotions text -->
+
-
+
+
-
+
+
- ${uiLabelMap.EcommerceYouMightAlsoIntrested}:
+ ${uiLabelMap.EcommerceYouMightAlsoIntrested}:
- <#-- random complementary products -->
- <#list associatedProducts as assocProduct>
-
- ${setRequestAttribute("optProduct", assocProduct)}
- ${setRequestAttribute("listIndex", assocProduct_index)}
- ${screens.render("component://ecommerce/widget/CatalogScreens.xml#productsummary")}
-
-
+ <#-- random complementary products -->
+ <#list associatedProducts as assocProduct>
+
+ ${setRequestAttribute("optProduct", assocProduct)}
+ ${setRequestAttribute("listIndex", assocProduct_index)}
+ ${screens.render("component://ecommerce/widget/CatalogScreens.xml#productsummary")}
+
+
-
+ |
| ${uiLabelMap.CommonSubtotal} |
- <@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() />
+ |
<#assign orderAdjustmentsTotal = 0 />
<#list shoppingCart.getAdjustments() as cartAdjustment>
- <#assign orderAdjustmentsTotal = orderAdjustmentsTotal + Static["org.apache.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) />
+ <#assign orderAdjustmentsTotal = orderAdjustmentsTotal +
+ Static["org.apache.ofbiz.order.order.OrderReadHelper"]
+ .calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) />
| ${uiLabelMap.ProductDiscount} |
- <@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency() /> |
+
+
+ <@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency() />
+ |
| ${uiLabelMap.OrderShippingAndHandling} |
- <@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() />
+ |
| ${uiLabelMap.OrderSalesTax} |
- <@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() />
+ |
| ${uiLabelMap.OrderGrandTotal} |
- <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() />
+ |
@@ -66,16 +79,29 @@
<#else>
<#assign parentProductId = cartLine.getProductId() />
- <#assign smallImageUrl = Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher, "url")! />
+ <#assign smallImageUrl = Static["org.apache.ofbiz.product.product.ProductContentWrapper"]
+ .getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher, "url")! />
<#if !smallImageUrl?string?has_content><#assign smallImageUrl = "" />
- |
+
+ |
${cartLine.getName()!} |
${cartLine.getDisplayPrice()} |
- ${cartLine.getQuantity()?string.number} |
- <@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /> |
- <@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() /> |
+
+ ${cartLine.getQuantity()?string.number}
+ |
+
+
+ <@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() />
+
+ |
+
+
+ <@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() />
+
+ |
@@ -101,7 +127,9 @@
| ${uiLabelMap.CommonSubtotal} |
- <@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() />
+ |
| ${uiLabelMap.ProductDiscount} |
@@ -108,7 +136,9 @@
<#assign orderAdjustmentsTotal = 0 />
<#list shoppingCart.getAdjustments() as cartAdjustment>
- <#assign orderAdjustmentsTotal = orderAdjustmentsTotal + Static["org.apache.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) />
+ <#assign orderAdjustmentsTotal = orderAdjustmentsTotal +
+ Static["org.apache.ofbiz.order.order.OrderReadHelper"]
+ .calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) />
<@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency() />
|
@@ -115,15 +145,21 @@
| ${uiLabelMap.OrderShippingAndHandling} |
- <@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() />
+ |
| ${uiLabelMap.OrderSalesTax} |
- <@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() />
+ |
| ${uiLabelMap.OrderGrandTotal} |
- <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() />
+ |
@@ -136,33 +172,56 @@
<#else>
<#assign parentProductId = cartLine.getProductId() />
- <#assign smallImageUrl = Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher, "url")! />
+ <#assign smallImageUrl = Static["org.apache.ofbiz.product.product.ProductContentWrapper"]
+ .getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL",
+ locale, dispatcher, "url")! />
<#if !smallImageUrl?string?has_content><#assign smallImageUrl = "" />
<#if smallImageUrl?string?has_content>
-
+
${cartLine.getName()!} |
- <@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency() />
+ |
<#if cartLine.getIsPromo()>
${cartLine.getQuantity()?string.number}
<#else>
-
-
- (${uiLabelMap.CommonRequired})
- (${uiLabelMap.CommonPleaseEnterValidNumberInThisField})
+
+
+
+ (${uiLabelMap.CommonRequired})
+
+
+ (${uiLabelMap.CommonPleaseEnterValidNumberInThisField})
+
|
<#if !cartLine.getIsPromo()>
- <@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() />
+ |
<#else>
- <@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() />
+ |
- <@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() /> |
+
+ <@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() />
+ |
<#if !cartLine.getIsPromo()>
-  |
+
+
+
+
+ |
@@ -176,8 +235,12 @@
Index: specialpurpose/ecommerce/template/catalog/AdvancedSearch.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/AdvancedSearch.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/AdvancedSearch.ftl (working copy)
@@ -16,45 +16,58 @@
specific language governing permissions and limitations
under the License.
-->
-<#assign searchOptionsHistoryList = Static["org.apache.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)/>
-<#assign currentCatalogId = Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)/>
+<#assign searchOptionsHistoryList =
+ Static["org.apache.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)/>
+<#assign currentCatalogId =
+ Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)/>
${uiLabelMap.ProductAdvancedSearchInCategory}
Index: specialpurpose/ecommerce/template/catalog/AjaxBreadCrumbs.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/AjaxBreadCrumbs.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/AjaxBreadCrumbs.ftl (working copy)
@@ -18,53 +18,45 @@
-->
-<#assign isDefaultTheme = !layoutSettings.VT_FTR_TMPLT_LOC?contains("multiflex")>
-<#if isDefaultTheme>
- ${uiLabelMap.CommonMain} >
-<#else>
+ <#assign isDefaultTheme = !layoutSettings.VT_FTR_TMPLT_LOC?contains("multiflex")>
+ <#if isDefaultTheme>
+ ${uiLabelMap.CommonMain} >
+ <#else>
+
Index: specialpurpose/ecommerce/template/catalog/ChooseCatalog.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/ChooseCatalog.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/ChooseCatalog.ftl (working copy)
@@ -18,28 +18,30 @@
-->
<#assign catalogCol = Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogIdsAvailable(request)!>
<#assign currentCatalogId = Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)!>
-<#assign currentCatalogName = Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, currentCatalogId)!>
+<#assign currentCatalogName =
+ Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, currentCatalogId)!>
<#-- Only show if there is more than 1 (one) catalog, no sense selecting when there is only one option... -->
<#if (catalogCol?size > 1)>
-
-
-
- - ${uiLabelMap.ProductChooseCatalog}
-
-
+
+
+
+ - ${uiLabelMap.ProductChooseCatalog}
+
+
+
+
+
+
-
-
-
-
Index: specialpurpose/ecommerce/template/catalog/ConfigProductDetail.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/ConfigProductDetail.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/ConfigProductDetail.ftl (working copy)
@@ -24,341 +24,380 @@
<#-- virtual product javascript -->
${virtualJavaScript!}
+ }
+ //-->
+
-
-
- <#-- Category next/previous -->
- <#if category??>
-
- |
- <#if previousProductId??>
- ${uiLabelMap.CommonPrevious} |
-
- ${(category.categoryName)?default(category.description)!}
- <#if nextProductId??>
- | ${uiLabelMap.CommonNext}
-
- |
-
-
-
- |
-
- <#-- Product image/name/price -->
+<#-- Category next/previous -->
+<#if category??>
- |
- <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL", "url")!>
- <#-- remove the next two lines to always display the virtual image first (virtual images must exist) -->
- <#if firstLargeImage?has_content>
- <#assign productLargeImageUrl = firstLargeImage>
+ |
+ <#if previousProductId??>
+ ${uiLabelMap.CommonPrevious} |
- <#if productLargeImageUrl?string?has_content>
- 
+
+ ${(category.categoryName)?default(category.description)!}
+
+ <#if nextProductId??> |
+ ${uiLabelMap.CommonNext}
|
+
+
+
+ |
+
+<#-- Product image/name/price -->
+
+ |
+ <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL", "url")!>
+ <#-- remove the next two lines to always display the virtual image first (virtual images must exist) -->
+ <#if firstLargeImage?has_content>
+ <#assign productLargeImageUrl = firstLargeImage>
+
+ <#if productLargeImageUrl?string?has_content>
+
+
+
+
+ |
${productContentWrapper.get("PRODUCT_NAME", "html")!}
${productContentWrapper.get("DESCRIPTION", "html")!}
${product.productId!}
- <#-- example of showing a certain type of feature with the product -->
- <#if sizeProductFeatureAndAppls?has_content>
-
- <#if (sizeProductFeatureAndAppls?size == 1)>
- <#-- TODO : i18n -->
- Size:
- <#else>
- Sizes Available:
-
- <#list sizeProductFeatureAndAppls as sizeProductFeatureAndAppl>
- ${sizeProductFeatureAndAppl.description?default(sizeProductFeatureAndAppl.abbrev?default(sizeProductFeatureAndAppl.productFeatureId))}<#if sizeProductFeatureAndAppl_has_next>,
-
+ <#-- example of showing a certain type of feature with the product -->
+ <#if sizeProductFeatureAndAppls?has_content>
+
+ <#if (sizeProductFeatureAndAppls?size == 1)>
+ <#-- TODO : i18n -->
+ Size:
+ <#else>
+ Sizes Available:
+
+ <#list sizeProductFeatureAndAppls as sizeProductFeatureAndAppl>
+ ${sizeProductFeatureAndAppl.description?default(sizeProductFeatureAndAppl.abbrev?default(
+ sizeProductFeatureAndAppl.productFeatureId))}
+ <#if sizeProductFeatureAndAppl_has_next>,
+
+
+
+ <#-- for prices:
+ - if totalPrice is present, use it (totalPrice is the price calculated from the parts)
+ - if price < competitivePrice, show competitive or "Compare At" price
+ - if price < listPrice, show list price
+ - if price < defaultPrice and defaultPrice < listPrice, show default
+ - if isSale show price with salePrice style and print "On Sale!"
+ -->
+ <#if totalPrice??>
+ ${uiLabelMap.ProductAggregatedPrice}:
+
+ <@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/>
+
+
+ <#else>
+ <#if price.competitivePrice?? && price.price?? && price.price < price.competitivePrice>
+ ${uiLabelMap.ProductCompareAtPrice}:
+
+ <@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/>
+
-
- <#-- for prices:
- - if totalPrice is present, use it (totalPrice is the price calculated from the parts)
- - if price < competitivePrice, show competitive or "Compare At" price
- - if price < listPrice, show list price
- - if price < defaultPrice and defaultPrice < listPrice, show default
- - if isSale show price with salePrice style and print "On Sale!"
- -->
- <#if totalPrice??>
- ${uiLabelMap.ProductAggregatedPrice}: <@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/>
- <#else>
- <#if price.competitivePrice?? && price.price?? && price.price < price.competitivePrice>
- ${uiLabelMap.ProductCompareAtPrice}: <@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/>
-
<#if price.listPrice?? && price.price?? && price.price < price.listPrice>
- ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
+ ${uiLabelMap.ProductListPrice}:
+
+ <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
+
+
- <#if price.listPrice?? && price.defaultPrice?? && price.price?? && price.price < price.defaultPrice && price.defaultPrice < price.listPrice>
- ${uiLabelMap.ProductRegularPrice}: <@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/>
+ <#if price.listPrice?? && price.defaultPrice?? && price.price?? &&
+ price.price < price.defaultPrice && price.defaultPrice < price.listPrice>
+ ${uiLabelMap.ProductRegularPrice}:
+
+ <@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/>
+
+
-
- <#if price.isSale?? && price.isSale>
- ${uiLabelMap.OrderOnSale}!
- <#assign priceStyle = "salePrice">
- <#else>
- <#assign priceStyle = "regularPrice">
-
- ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual!> from <@ofbizCurrency amount=price.price isoCode=price.currencyUsed/>
-
+ <#if price.isSale?? && price.isSale>
+ ${uiLabelMap.OrderOnSale}!
+ <#assign priceStyle = "salePrice">
+ <#else>
+ <#assign priceStyle = "regularPrice">
+
+ ${uiLabelMap.OrderYourPrice}:
+ <#if "Y" = product.isVirtual!> from
+
+ <@ofbizCurrency amount=price.price isoCode=price.currencyUsed/>
+
<#if price.listPrice?? && price.price?? && price.price < price.listPrice>
<#assign priceSaved = price.listPrice - price.price>
<#assign percentSaved = (priceSaved / price.listPrice) * 100>
- ${uiLabelMap.OrderSave}: <@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)
-
-
-
- <#-- Included quantities/pieces -->
- <#if product.quantityIncluded?? && product.quantityIncluded != 0>
- ${uiLabelMap.OrderIncludes}:
- ${product.quantityIncluded!}
- ${product.quantityUomId!}
+ ${uiLabelMap.OrderSave}:
+
+ <@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)
+
- <#if product.piecesIncluded?? && product.piecesIncluded?long != 0>
- ${uiLabelMap.OrderPieces}:
- ${product.piecesIncluded}
-
-
- <#if daysToShip??>
- ${uiLabelMap.ProductUsuallyShipsIn} ${daysToShip} ${uiLabelMap.CommonDays}
-
+
+ <#-- Included quantities/pieces -->
+ <#if product.quantityIncluded?? && product.quantityIncluded != 0>
+
+ ${uiLabelMap.OrderIncludes}:${product.quantityIncluded!}${product.quantityUomId!}
+
+
+ <#if product.piecesIncluded?? && product.piecesIncluded?long != 0>
+
+ ${uiLabelMap.OrderPieces}:${product.piecesIncluded}
+
+
+ <#if daysToShip??>
+
+ ${uiLabelMap.ProductUsuallyShipsIn} ${daysToShip} ${uiLabelMap.CommonDays}
+
+
- <#-- show tell a friend details only in ecommerce application -->
+ <#-- show tell a friend details only in ecommerce application -->
- <#if disFeatureList?? && 0 < disFeatureList.size()>
-
- <#list disFeatureList as currentFeature>
+ <#if disFeatureList?? && 0 < disFeatureList.size()>
+
+ <#list disFeatureList as currentFeature>
+
+ ${currentFeature.productFeatureTypeId}: ${currentFeature.description}
+
+
+
+
+
+ |
+
+
+ |
+ <#-- check to see if introductionDate hasn't passed yet -->
+ <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
+
+ ${uiLabelMap.ProductProductNotYetMadeAvailable}.
+ <#-- check to see if salesDiscontinuationDate has passed -->
+ <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)>
+ ${uiLabelMap.ProductProductNoLongerAvailable}.
+ <#-- check to see if the product requires inventory check and has inventory -->
+ <#else>
+ <#if inStock>
+ <#if product.requireAmount?default("N") == "Y">
+ <#assign hiddenStyle = "visible">
<#else>
-
-
- <#if productNotAvailable??>
- <#assign isStoreInventoryRequired = Static["org.apache.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)>
- <#if isStoreInventoryRequired>
- ${uiLabelMap.ProductItemOutOfStock}.
- <#assign inStock = false>
- <#else>
- ${product.inventoryMessage!}
-
-
+ <#assign hiddenStyle = "hidden">
-
- | |
-
- <#-- check to see if introductionDate hasn't passed yet -->
- <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
-
- ${uiLabelMap.ProductProductNotYetMadeAvailable}.
- <#-- check to see if salesDiscontinuationDate has passed -->
- <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)>
- ${uiLabelMap.ProductProductNoLongerAvailable}.
- <#-- check to see if the product requires inventory check and has inventory -->
+
+ Amount:
+
+
+ <#if !configwrapper.isCompleted()>
+ [${uiLabelMap.EcommerceProductNotConfigured}]
+
<#else>
- <#if inStock>
- <#if product.requireAmount?default("N") == "Y">
- <#assign hiddenStyle = "visible">
- <#else>
- <#assign hiddenStyle = "hidden">
-
-
- Amount:
-
-
- <#if !configwrapper.isCompleted()>
- [${uiLabelMap.EcommerceProductNotConfigured}]
-
- <#else>
- ${uiLabelMap.OrderAddToCart}
-
- <#if minimumQuantity?? && minimumQuantity > 0>
- Minimum order quantity is ${minimumQuantity}.
-
-
+
+
+ ${uiLabelMap.OrderAddToCart}
+
+
+
+ <#if minimumQuantity?? && minimumQuantity > 0>
+ Minimum order quantity is ${minimumQuantity}.
- <#if requestParameters.category_id??>
-
-
+
+ <#if requestParameters.category_id??>
+
+
+
-
+
<#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous">
-
-
- <#else>
- ${uiLabelMap.OrderYouMust} ${uiLabelMap.CommonBeLogged}
- ${uiLabelMap.OrderToAddSelectedItemsToShoppingList}.
+ <#else>
+ ${uiLabelMap.OrderYouMust}
+ ${uiLabelMap.CommonBeLogged}
+ ${uiLabelMap.OrderToAddSelectedItemsToShoppingList}.
- <#-- Prefill first select box (virtual products only) -->
- <#if variantTree?? && 0 < variantTree.size()>
-
-
+ <#-- Prefill first select box (virtual products only) -->
+ <#if variantTree?? && 0 < variantTree.size()>
+
+
- <#-- Swatches (virtual products only) -->
- <#if variantSample?? && 0 < variantSample.size()>
- <#assign imageKeys = variantSample.keySet()>
- <#assign imageMap = variantSample>
-
-
-
- <#assign maxIndex = 7>
- <#assign indexer = 0>
- <#list imageKeys as key>
- <#assign swatchProduct = imageMap.get(key)>
- <#if swatchProduct?has_content && indexer < maxIndex>
- <#assign imageUrl = Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request, "url")!>
- <#if !imageUrl?string?has_content>
- <#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL", "url")!>
-
- <#if !imageUrl?string?has_content>
- <#assign imageUrl = "/images/defaultImage.jpg">
-
-
- 
-
- ${key}
- |
+ <#-- Swatches (virtual products only) -->
+ <#if variantSample?? && 0 < variantSample.size()>
+ <#assign imageKeys = variantSample.keySet()>
+ <#assign imageMap = variantSample>
+
+
+
+ <#assign maxIndex = 7>
+ <#assign indexer = 0>
+ <#list imageKeys as key>
+ <#assign swatchProduct = imageMap.get(key)>
+ <#if swatchProduct?has_content && indexer < maxIndex>
+ <#assign imageUrl =
+ Static["org.apache.ofbiz.product.product.ProductContentWrapper"]
+ .getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request, "url")!>
+ <#if !imageUrl?string?has_content>
+ <#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL", "url")!>
- <#assign indexer = indexer + 1>
-
- <#if (indexer > maxIndex)>
- ${uiLabelMap.OrderMoreOptionsAvailable}.
+ <#if !imageUrl?string?has_content>
+ <#assign imageUrl = "/images/defaultImage.jpg">
+
+
+
+
+
+
+
+ ${key}
+
+ |
-
-
-
+ <#assign indexer = indexer + 1>
+
+ <#if (indexer > maxIndex)>
+ ${uiLabelMap.OrderMoreOptionsAvailable}.
+
+
+
+
|
-
-
-
- <#-- Long description of product -->
+<#-- Long description of product -->
|
${productContentWrapper.get("LONG_DESCRIPTION", "html")!}
|
-
-
|
-
- <#-- Any attributes/etc may go here -->
- <#-- Product Configurator -->
|
- |
+
+<#-- Any attributes/etc may go here -->
+<#-- Product Configurator -->
+
+ |
+ |
<#if sessionAttributes.lastViewedProducts?? && sessionAttributes.lastViewedProducts?has_content>
-
<#list sessionAttributes.lastViewedProducts as productId>
@@ -39,13 +38,12 @@
-
<#else>
-
-
- |
- ${uiLabelMap.ProductNotViewedAnyProducts}.
- |
-
-
+
+
+ |
+ ${uiLabelMap.ProductNotViewedAnyProducts}.
+ |
+
+
Index: specialpurpose/ecommerce/template/catalog/LayeredCategoryDetail.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/LayeredCategoryDetail.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/LayeredCategoryDetail.ftl (working copy)
@@ -18,90 +18,99 @@
-->
<#macro paginationControls>
- <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)>
- <#if (viewIndexMax?int > 0)>
-
- <#-- Start Page Select Drop-Down -->
-
- <#-- End Page Select Drop-Down -->
- <#if (0 < viewIndex?int)>
- ${uiLabelMap.CommonPrevious} |
-
- <#if ((listSize?int - viewSize?int) > 0)>
- ${lowIndex + 1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
-
- <#if highIndex?int < listSize?int>
- | ${uiLabelMap.CommonNext}
-
-
-
+ <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)>
+ <#if (viewIndexMax?int > 0)>
+
+ <#-- Start Page Select Drop-Down -->
+
+ <#-- End Page Select Drop-Down -->
+ <#if (0 < viewIndex?int)>
+ ${uiLabelMap.CommonPrevious} |
+
+ <#if ((listSize?int - viewSize?int) > 0)>
+ ${lowIndex + 1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
+
+ <#if highIndex?int < listSize?int>
+ |
+ ${uiLabelMap.CommonNext}
+
+
+
+
<#if productCategory??>
- <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME", "html")!/>
- <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION", "html")!/>
- <#if categoryName?has_content>
- ${categoryName}
-
- <#if categoryDescription?has_content>
- ${categoryDescription}
-
- <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION", "html")!/>
- <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL", "url")!/>
- <#if categoryImageUrl?string?has_content || longDescription?has_content>
-
- <#if categoryImageUrl?string?has_content>
- <#assign height=100/>
- 
-
- <#if longDescription?has_content>
- ${longDescription}
-
-
+ <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME", "html")!/>
+ <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION", "html")!/>
+ <#if categoryName?has_content>
+ ${categoryName}
+ <#if categoryDescription?has_content>
+ ${categoryDescription}
+
+ <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION", "html")!/>
+ <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL", "url")!/>
+ <#if categoryImageUrl?string?has_content || longDescription?has_content>
+
+ <#if categoryImageUrl?string?has_content>
+ <#assign height=100/>
+
+
+ <#if longDescription?has_content>
+ ${longDescription}
+
+
+
<#if productIds?has_content>
- <@paginationControls/>
- <#assign numCol = numCol?default(1)>
- <#assign numCol = numCol?number>
- <#assign tabCol = 1>
-
- style="position: relative; margin-top: ${height}px;"
-
- class="productsummary-container<#if (numCol?int > 1)> matrix">
+ <@paginationControls/>
+ <#assign numCol = numCol?default(1)>
+ <#assign numCol = numCol?number>
+ <#assign tabCol = 1>
+
+ style="position: relative; margin-top: ${height}px;"
+ class="productsummary-container<#if (numCol?int > 1)> matrix">
<#if (numCol?int > 1)>
- <#list productIds as productId>
- <#if (numCol?int == 1)>
- ${setRequestAttribute("optProductId", productId)}
- ${setRequestAttribute("listIndex", productId_index)}
- ${screens.render(productsummaryScreen)}
- <#else>
- <#if (tabCol?int = 1)>
- |
- ${setRequestAttribute("optProductId", productId)}
- ${setRequestAttribute("listIndex", productId_index)}
- ${screens.render(productsummaryScreen)}
- |
- <#if (tabCol?int = numCol)>
- <#assign tabCol = tabCol+1><#if (tabCol?int > numCol)><#assign tabCol = 1>
-
-
+ <#list productIds as productId>
+ <#if (numCol?int == 1)>
+ ${setRequestAttribute("optProductId", productId)}
+ ${setRequestAttribute("listIndex", productId_index)}
+ ${screens.render(productsummaryScreen)}
+ <#else>
+ <#if (tabCol?int = 1)>
+ |
+ ${setRequestAttribute("optProductId", productId)}
+ ${setRequestAttribute("listIndex", productId_index)}
+ ${screens.render(productsummaryScreen)}
+ |
+ <#if (tabCol?int = numCol)>
+ <#assign tabCol = tabCol+1><#if (tabCol?int > numCol)><#assign tabCol = 1>
+
+
<#if (numCol?int > 1)>
-
- <@paginationControls/>
+
+ <@paginationControls/>
<#else>
-
- ${uiLabelMap.ProductNoProductsInThisCategory}
+
+ ${uiLabelMap.ProductNoProductsInThisCategory}
Index: specialpurpose/ecommerce/template/catalog/LayeredNavBar.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/LayeredNavBar.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/LayeredNavBar.ftl (working copy)
@@ -29,7 +29,11 @@
<#assign currentSearchCategoryName = categoryContentWrapper.get("CATEGORY_NAME", "html")?string />
<#list searchConstraintStrings as searchConstraintString>
<#if searchConstraintString.indexOf(currentSearchCategoryName) != -1>
- X<#noescape> ${searchConstraintString}
+
+ X
+ <#noescape> ${searchConstraintString}
+
@@ -36,7 +40,13 @@
<#list searchConstraintStrings as searchConstraintString>
<#if searchConstraintString.indexOf("Category: ") = -1 && searchConstraintString != "Exclude Variants">
- X ${searchConstraintString}
+
+
+ X
+
+ ${searchConstraintString}
+
<#if showSubCats>
@@ -46,7 +56,11 @@
<#list subCategoryList as category>
<#assign subCategoryContentWrapper = category.categoryContentWrapper />
<#assign categoryName = subCategoryContentWrapper.get("CATEGORY_NAME", "html")!?string />
- ${categoryName!} (${category.count})
+
+
+ ${categoryName!} (${category.count})
+
+
@@ -56,7 +70,11 @@
${colorFeatureType.description}
+
${uiLabelMap.EcommerceYouMightLike}...
- <#-- random complementary products -->
-
+ <#-- random complementary products -->
+
<#list associatedProducts as miniProduct>
- -
- ${setRequestAttribute("miniProdQuantity", 1)}
- ${setRequestAttribute("miniProdFormName", "theminiassocprod" + miniProduct_index + "form")}
- ${setRequestAttribute("optProductId", miniProduct.productId)}
- ${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")}
-
+ -
+ ${setRequestAttribute("miniProdQuantity", 1)}
+ ${setRequestAttribute("miniProdFormName", "theminiassocprod" + miniProduct_index + "form")}
+ ${setRequestAttribute("optProductId", miniProduct.productId)}
+ ${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")}
+
-
+
-
+
-
- ${uiLabelMap.OrderLastSearches}...
-
- <#list searchOptionsHistoryList[0..limit] as searchOptions>
- <#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
- -
+ <#if (searchOptionsHistoryList?size > maxToShow)>
+ <#assign limit=maxToShow/>
+ <#else>
+ <#assign limit=(searchOptionsHistoryList?size-1)/>
+
+
+
+ ${uiLabelMap.OrderLastSearches}...
+
+ <#list searchOptionsHistoryList[0..limit] as searchOptions>
+ <#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
+ -
${uiLabelMap.EcommerceSearchNumber} ${searchOptions_index + 1}
-
-
-
-
-
+
+
+
@@ -32,16 +38,28 @@
<#list lastViewedCategories[0..limit] as categoryId>
- <#assign category = delegator.findOne("ProductCategory", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", categoryId), true)!>
+ <#assign category = delegator.findOne("ProductCategory",
+ Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", categoryId), true)!>
<#if category?has_content>
-
- <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")??>
- ${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")}
- <#elseif catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")??>
- ${catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")}
- <#else>
- ${category.description!}
-
+ <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? &&
+ catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")??>
+
+ ${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")}
+
+ <#elseif catContentWrappers?? && catContentWrappers[category.productCategoryId]?? &&
+ catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")??>
+
+ ${catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")}
+
+ <#else>
+
+ ${category.description!}
+
+
Index: specialpurpose/ecommerce/template/catalog/MiniLastViewedProducts.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/MiniLastViewedProducts.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/MiniLastViewedProducts.ftl (working copy)
@@ -20,14 +20,26 @@
<#assign maxToShow = 4/>
<#assign lastViewedProducts = sessionAttributes.lastViewedProducts!/>
<#if lastViewedProducts?has_content>
- <#if (lastViewedProducts?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(lastViewedProducts?size-1)/>
+ <#if (lastViewedProducts?size > maxToShow)>
+ <#assign limit=maxToShow/>
+ <#else>
+ <#assign limit=(lastViewedProducts?size-1)/>
+
Index: specialpurpose/ecommerce/template/catalog/MiniProductSummary.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/MiniProductSummary.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/MiniProductSummary.ftl (working copy)
@@ -17,45 +17,81 @@
under the License.
-->
<#if miniProduct??>
- ${miniProductContentWrapper.get("PRODUCT_NAME", "html")?default("No Name Available")}
-
- - ${miniProduct.productId}
- <#if (priceResult.price?default(0) > 0 && miniProduct.requireAmount?default("N") == "N")>
- <#if "Y" = miniProduct.isVirtual!> ${uiLabelMap.CommonFrom}
- <#if totalPrice??>
-
- ${uiLabelMap.ProductAggregatedPrice}: <@ofbizCurrency amount=totalPrice isoCode=priceResult.currencyUsed/>
- <#else>
-
- <@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/>
-
-
-
+
+ ${miniProductContentWrapper.get("PRODUCT_NAME", "html")?default("No Name Available")}
+
+
+ -
+ ${miniProduct.productId}
+ <#if (priceResult.price?default(0) > 0 && miniProduct.requireAmount?default("N") == "N")>
+ <#if "Y" = miniProduct.isVirtual!>
+ ${uiLabelMap.CommonFrom}
+
+ <#if totalPrice??>
+
-
+ ${uiLabelMap.ProductAggregatedPrice}:
+
+ <@ofbizCurrency amount=totalPrice isoCode=priceResult.currencyUsed/>
+
+
+ <#else>
+
+ <@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/>
+
+
+
<#if (miniProduct.introductionDate??) && (nowTimeLong < miniProduct.introductionDate.getTime())>
- <#-- check to see if introductionDate hasn't passed yet -->
- - ${uiLabelMap.ProductNotYetAvailable}
+ <#-- check to see if introductionDate hasn't passed yet -->
+ - ${uiLabelMap.ProductNotYetAvailable}
<#elseif (miniProduct.salesDiscontinuationDate??) && (nowTimeLong > miniProduct.salesDiscontinuationDate.getTime())>
- <#-- check to see if salesDiscontinuationDate has passed -->
- - ${uiLabelMap.ProductNoLongerAvailable}
+ <#-- check to see if salesDiscontinuationDate has passed -->
+ - ${uiLabelMap.ProductNoLongerAvailable}
<#elseif miniProduct.isVirtual?default("N") == "Y">
- - ${uiLabelMap.OrderChooseVariations}...
+ -
+
+ ${uiLabelMap.OrderChooseVariations}...
+
+
<#elseif miniProduct.requireAmount?default("N") == "Y">
- - ${uiLabelMap.OrderChooseAmount}...
+ -
+
+ ${uiLabelMap.OrderChooseAmount}...
+
+
<#else>
-
-
-
+
Index: specialpurpose/ecommerce/template/catalog/MiniReOrderProds.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/MiniReOrderProds.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/MiniReOrderProds.ftl (working copy)
@@ -17,24 +17,23 @@
under the License.
-->
<#if reorderProducts?has_content>
-
+
-
- - ${uiLabelMap.ProductQuickReorder}...
-
+
+ - ${uiLabelMap.ProductQuickReorder}...
+
- <#list reorderProducts as miniProduct>
-
- ${setRequestAttribute("miniProdQuantity", reorderQuantities.get(miniProduct.productId))}
- ${setRequestAttribute("miniProdFormName", "theminireorderprod" + miniProduct_index + "form")}
- ${setRequestAttribute("optProductId", miniProduct.productId)}
- ${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")}
-
- <#if miniProduct_has_next>
-
-
-
+ <#list reorderProducts as miniProduct>
+
+ ${setRequestAttribute("miniProdQuantity", reorderQuantities.get(miniProduct.productId))}
+ ${setRequestAttribute("miniProdFormName", "theminireorderprod" + miniProduct_index + "form")}
+ ${setRequestAttribute("optProductId", miniProduct.productId)}
+ ${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")}
+
+ <#if miniProduct_has_next>
+
+
-
+
Index: specialpurpose/ecommerce/template/catalog/PopularTags.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/PopularTags.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/PopularTags.ftl (working copy)
@@ -27,7 +27,10 @@
<#list tagCloudList as tagCloud>
- ${tagCloud.tag}
+
+ ${tagCloud.tag}
+
Index: specialpurpose/ecommerce/template/catalog/ProductCategories.ftl
===================================================================
--- specialpurpose/ecommerce/template/catalog/ProductCategories.ftl (revision 1761125)
+++ specialpurpose/ecommerce/template/catalog/ProductCategories.ftl (working copy)
@@ -16,19 +16,21 @@
specific language governing permissions and limitations
under the License.
-->
-
-
-
+
+
+
-
-
-
-
- - ${uiLabelMap.ProductCategories}
-
-
-
-
+
+
+ - ${uiLabelMap.ProductCategories}
+
+
+
+
<#if imageUrl?string?has_content>
-
+
<#if titleText?has_content>
${titleText}
@@ -50,5 +65,5 @@
${detailText}
- <#assign productAdditionalImage1 = productContentWrapper.get("ADDITIONAL_IMAGE_1", "url")! />
- <#assign productAdditionalImage2 = productContentWrapper.get("ADDITIONAL_IMAGE_2", "url")! />
- <#assign productAdditionalImage3 = productContentWrapper.get("ADDITIONAL_IMAGE_3", "url")! />
- <#assign productAdditionalImage4 = productContentWrapper.get("ADDITIONAL_IMAGE_4", "url")! />
-
- <#-- Category next/previous -->
- <#if category??>
-
+ <#assign productAdditionalImage1 = productContentWrapper.get("ADDITIONAL_IMAGE_1", "url")! />
+ <#assign productAdditionalImage2 = productContentWrapper.get("ADDITIONAL_IMAGE_2", "url")! />
+ <#assign productAdditionalImage3 = productContentWrapper.get("ADDITIONAL_IMAGE_3", "url")! />
+ <#assign productAdditionalImage4 = productContentWrapper.get("ADDITIONAL_IMAGE_4", "url")! />
+
+ <#-- Category next/previous -->
+ <#if category??>
+ | | |
![[PayPal Express Checkout]](https://www.paypal.com/${initialLocaleComplete}/i/btn/btn_xpressCheckout.gif)
-
- <#else>
-